From: Paul Eggert Date: Sat, 12 Feb 2011 10:08:19 +0000 (-0800) Subject: Merge from mainline. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~13 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4e6de32c5aaa8ce3f2440037807b82b4f7d0371b;p=emacs.git Merge from mainline. --- 4e6de32c5aaa8ce3f2440037807b82b4f7d0371b diff --cc src/ChangeLog index 8c13d6fd29b,8fb59a5b8f5..65cfc8c5ce4 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,31 -1,9 +1,35 @@@ +2011-02-12 Paul Eggert + + Remove no-longer needed getloadavg symbols. + * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove. + * s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef. + * s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT): + (LDAV_SYMBOL): Remove. + * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove. + * s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove. + + Import getloadavg module from gnulib. + * deps.mk (getloadavg.o): Remove; gnulib now does this. + * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib + now does this. + * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this. + * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise. + * config.in: Regenerate. + 2011-02-12 Paul Eggert + Port to Sun C 5.11, which has __attribute__ ((__aligned (N))). + * md5.h (ATTRIBUTE_ALIGNED): New macro. + (struct md5_ctx): Use it. + Port to Solaris 10, which doesn't support FC_HINT_STYLE. * xftfont.c (FC_HINT_STYLE): #define to "hintstyle" if not defined.